Requirements expanded and moved to a chapter