Updated to 1.5.2

Updated and refactored