Adding changes mentioned by @mikeker and @joelpittet