Massive updates

'