Added answer logic