added richa's changes, merging rakesh changes and sorry for classpath no other option