refactor to use with planet-android.es