improved swap performance