UPDATED TO LATEST 1.5.2 SNAPSHOT