Added some stuff, I think