Improved Wipe

More wipe status