updated moved arround some things