Sudhir: v 1.0 changes