First Update
rearranged everything