lets fix this ish again