Build 35

Fixed 3-fold repetition (hopefully this time for good)