FIXUP: comments and helpers