Added some stuff from Cloud9