add Next and fix scope of complet