changes to support activation