Added update_only option to more routines.