Commit after merging Linneker's changes