removed old style that had been commented out