updated - will finish remaining next week