dont know why i made these changes, but i guess i had my reasons