Changes from android to app