fixing the bullshit i created