Changes for Chameleon OS