fixed elvyn's bullshit