now, with comments