Commit before merging Linneker's changes