made some changes
all