Amended Q5 for consistency with logic flow