Updated with requirements