PShrestha: more changes