clean up, added redesign