change structure + add activator functions