made some changes;