v1.3 - update base
v1.3 - correct logic
v1.3 - update base