Merge Nishta's changes back in

Signed-off-by: dpulitano <danielpulitano@gmail.com>