Updated to have always on compatibility