Added fee calculation