Make changes suggested by Annam