merge in nikhil's changes