made demo android compatible