fixing everythinggg