Maybe rewritten and tested in rel.2.0