todo is ok again