Updating some DataArray functions
Fixing merge conflicts