made some modefications