Final version
Remove todo tag
local merge