SOME UPDATES SO IT WORKS ON MOBILE