Fixed EVERY THING:)