Imported Dubtraction changes
More fixes