Changes to Scanner to improve efficiency, added more channels