Updating based on feedback from @ahmadia