Add answer checking