Updating utils and separating focus and active states.