Some changes
Add new function for activity generation