Main changes

Scanner mod as per request