Another update to activation (broken)