Removed dependency on outside functionality.