last changes with android annotations