TEST VERSION - Only Roll correction applied.
Other improvements in the code...