working on #51: improving report