* module improvement