changes to swap module