1.3.0: Cleaned up and added PW 2.5 code