changes to simplify, no more 'focus' mode