Movement scout + water fix