manipulations improvements