Added swap functionality