Add more requirements and do some editorial restructuring.