Updating PR after feedback from @sitereactor