vinay - individual stuff,clean up