Integrate justin's wipe part 2