removed old code to start fresh