removed prev. commented code