removed old code before adding new merged version