More changes from Anitha & Ning