#1 Fix and activator inerface upgrade