OC re-design for @batcat_inaboat