Comment to Emil's part and edit my own subtext