Updated from PR feedback