Added a new feature
Fixed the feature because it was broken.