Some big changes
some changes made