tweaking answer handler logic