moved requirements to the right place