#155 , #170 : update report