Change interface and enhance scanning phase