Added answer functionality