iI made some changes