Changes for  Scan