Added more functional requirements to the mix