Totally improved new features
#41