Added the two new features.