added stuff that breaks but whatevs