added new modules from jochen