updating code + adding new modules