removed old logic