Adjustment of standard routines