Adjust to work on normal devices, without publish it