Modified requirements to new standard.

It still needs work.