Updated with PR feedback