Revised to include more if not all user stories