Since last visit logic improved