Changes for new OS