Added some stuff that was missing