added full functionality for expansions in all categories