master branch progress 06
newf 02