changes suggested by Nikhil