consistenc of arg names; rearrange formula to match Reda & Andreas