keeping changes
Merge branch 'tmp2'
few changes to res_rot and inserted hack to scate eta for testing