v1.1 - correct logic