Updated requirements after review