improvements before big scan