v1.2 - correct logic