small changes of name space, to be reworked