Updated fee processing some more