Added new version of focus