last commit before migrating to Andorid Studio