Changes made per Chris comments