Updated the list based on most recent requirements