Addressed consistency feedback from Everett