minor changes, and add singh