better answer handling