comments reworked for android client