removed old code, split code