Making some changes from cloud9