Added ACTIVATION button
Fixed excludsion process
Merge with development