merging ashish code