i add new modules and i made some modifications