activity notification
to merge
to merge 2