TODOs after discussion with SR