adding minor changes by Amit