Added some stuff, not working yet