made structural changes to 1.3.2