Deleted old stuff, added new stuff and update