First Cut from base
Fixed Conflicts