timeStamp and FileScan Code Changes