Revert "Some testing.."

This reverts commit 368df8a142cc335d59294aee095138904a564f3f.
Revert "Revert "Some testing..""

This reverts commit b4a03bbc05985a368cd8faf841b0663a7de463c3.