Added some stuff
Updated to latest