UPDATED 
We resolved some TODO