update answer handler logic