Clearer requirements, mostly a test commit