Snip comment, also work on #24