last step of all waterfalls was changed to finish()