Just cleaning up the mess i made part 1