upgraded to new ymodules syntax