Amended City Council Workshop (items 3a and 3b added)