scan implementation changes