changing client to patron throughout
more client to patron changes