City Council Workshop - Amended items 7c and 7d added