my revision of ocshop