Making flavor change easier for knightly pipeline