Cleaning up after my messy commits. Version 3.6.8