removed old code from 2