Implement @mhvk's comments