quick update before code review, removed old code