5.31

partial u-shape handling updated