Edited Use cases 14-17 to meet new template