Now with smaller routines!