further replaces
add tests for activity