Revert "fully repaired + new features"

This reverts commit 3c9503538fed8f2f23172a3d6ebcd29921e52e22.