made changes as grant suggested