Added more fieldpair and cleaned up the unecessary part