Improved focus states