Changed Aggregate function to display multiple rows