Added some stuff. Still not working...