Ashish changes 8/28
final touches