Optic, plus correct commenting