temp
tmp fix
now works on device