Modified todo which caused issues in chap 8