Done some TODO item