Update but still need to be normalise 27 -> 25 lines