Further improvements suggested by Matt