Added solution for activities