changes for swap view