added some stuff, I think