Continued to implement scanner