debugging
messed up everything
Revert "messed up everything"

This reverts commit 22cf4784b4c13399ddd05739d8b0e9ea24eb48b6.
Merge branch 'testing' into newsactivity