Now takes care of Curtis 10(8) and Hiroshi 12(9) methods as well