efactored QTE