removed old coding