need to re-arrange shop