Updated to wputilities 2.0