updated and removed old stuff from end