Improve command !swap