Integrate original and rerwin's frisbee better