Changes made, hopefully this works