fix this bullshit more