Switched calculations to new formula
FIX: coordinate transformation now performed again