Some new features (still untested).