Implement @embray's comments