activation revamp for 0.9