Works on #57, new displacement