redesigned my ocs a bit