Implement @cchurch suggestions