Refactor plus to use scan method