merging sjain7 with release