Added capturing, complete with suicide detection