Updates to the spray mechanisms