Move requirements to top and expand