Added back shopno2-functions