Use new wipe()
Better time handling