made some changes cuz i think i know what im doing