feature/patch finished patch as RFC6902 and traditional