made some changes lol