This should simplify the code, but it doesn't: Computing the displacement still needs a lot of code lines.
