made some changes and shit