fixed all that bullshit