made some changes
still