Shyam and Alex initial modifications.