Update TODO: scaling is not a problem anymore