update
added notscannedsince
merge