This is snigdha's updates from 1-14-13. Committing to a branch then merging in