added all files, new activate/deactivate bug