(WIP) Updating EX-60 logic