subtracted accidentally merged in diff from gplay branch II