fixing up Pacific, needs more work
fixing conflicts