Few more changes by Ram