touch swap is now working