add changes from desktop version