New Adjustment of standard routines