Nice changes to master

Nice changes