added original field to swap table