todo resolved