smallest displacement correction
merge master again