Use the simpler routines to maintain compatibility