Changes made per PR requests