simran's updates
merge