Added a couple features.