Following my changes for the yamba app from Android Bootcamp 2012