major changes
some changes