added shop and plan modes