Active example working again.
Merging new changes