added OC stuff (not working)