lots of updates and changes