move TODO to right place