fixed IRawGoods from simon's branch