made tweaks asked for by aashish