Messed something up with merging, re-merged precheck changes