v.8: more changes by Karthik