HAMA-681: add comments