Changes suggested by @jdblischak