args weaving adjustments due to last changes