activation functionality changed