fixed zach's bullshit