made some modifications

will change more