improved android client