made some changes, check them out!