slowly fixing the hacks