Reworked
removed old stuff