Commit before merge with Eriks stuff
Commit after merge