[CSE]
Fix dung shovelling

[*]
Update TODO