Fee logic added