Updates to focus effect related code