SVY-7568 speed optimisation