Updated cade to work in new environment