Harish Fixes for April 15
Haris update