changes to main files and class activator and deactivator
