Implemented more robust answer timing