Removed swap and change