Repair function calling, new modules