Some changes for comming shop