lots of updates
Pulled to merge