merge changes from raj and eli