Great changes!

These are changes you may want to commit into the main repo