fixing everythin that i broke few commits ago