Update todo and rebuild