updated names, modules, new functions