Update to requirements doc and code