-- some changes for compatibillity with android app