changes to swap assignemnt