added broken up stuff