Venkat's changes