Including new way to handle answer