Test
Revert "Add new features"

This reverts commit 30152b30dd0f506e8087f0fe06cdbb690f1c3b7d.