Reorganized own requirements w.r.t. sections