made some changes. hoping