changes for focus issue