refactoring some radian6 calls
more refactoring
Merge branch 'radian6'