v1.3.3:
Consolidating code