Fixed Shop (Needs Testing)