sorted out some bullshit