v.21 stable

before applying the 1st feedback