Moved requirements up; OCD