re-written
removed code