build ok, new code from Patrick

build ok, new code from Patrick