added new stuff and changed things