added some new stuff to activation routine