Make continue smarter