ADDED COMMENTS FOR THE TODOs