ugh reverting some stuff