possible fix + some garbage changes