Added dpm, rmeoved parameter, commented out code