changed to bake code from android developement