More changes
Commits before leaving on Sunday