Make changes suggested by Sean Ma