Several major updates
Merged