Updated requirements -- a lot of this could be stripped