lots of changes
updates