Fix bug, add verification code.