removed old code ch 2