Updated with last batch of requirements