Added some extra features, not on scope.