removed old code to mave room for the new code