activate method changes
merge dilshani
merge dilshani