properly handle old data