Add back the 3 new features

unstable