3194, the second attemt - removed remarks and sample tests.