Implement things proposed by @zeeman