just trying to improve complex scenario performance