Use new eye management