Updates to round pairings. Still need to fix wrap-around error