fixing the fees..not yet finish