edited some module(not complete)