[other]moved TODO up.