Still working on the displacement calculations