Optimisations and finite water dropping