Fixed displacement and added some comments