Changes after talking to Zathras about this PR