New version, tries to the trapezoidal valenti style, a little work to be done