Updated with comments from SYS-201.

CI-170