SQUASH ME: updated missing occurrences of active_thread