Changed some attributes of activity class
Merge