Make fees conditional?