Implement comments from @methane