Comments from blissit (@dev_blissit)