WowAce

------------------------------------------------------------------------
r121 | celess | 2009-01-02 02:50:35 +0000 (Fri, 02 Jan 2009) | 1 line
Changed paths:
   M /trunk/Data.lua
   M /trunk/Export.lua
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc

- minor update because looks liek packager backed up and got libs out of order
------------------------------------------------------------------------
r119 | celess | 2009-01-02 02:01:25 +0000 (Fri, 02 Jan 2009) | 6 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/Export.lua
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc
   M /trunk/UI_Dialog.lua

- fix for edit time
- fix for instance meta inconsistancy which caused several issues
- added various updates for localization
- cleaned up date code
- updated dialog code

------------------------------------------------------------------------
r117 | celess | 2008-12-29 19:52:15 +0000 (Mon, 29 Dec 2008) | 36 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/Export.lua
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc
   M /trunk/RaidTracker.xml
   M /trunk/UI_Button.lua
   M /trunk/UI_Dialog.lua
   M /trunk/UI_ItemOptions.lua
   M /trunk/UI_Options.lua
   M /trunk/UI_Options.xml
   M /trunk/UI_Templates.lua
   M /trunk/locales/localization.lua

- added new export format "EqDKP Strict"
1) this has less changes from forks and should be used if the first eq option doesn't work
2) should be good to try for loganfive et.al

- added HellbenderDKP and ItemLevelDKP for cost lookup
1) looks for ILDKP first and will cascade through them looking for a valid cost value
2) order: ildkp, hobdkp, hellbender, AdvancedItemTooltip
3) i know how to make hellbender work in wow at all as not updated for WotLK, i might post
something or just ask, hell bender is a more up to date Ace2 version of HoB-DKP
4) if you know of another system I can grab costs form let me know I'll add it

- rework pass of db update
1) will import CT and Forks even if already have existing raids
If you have a fresh db starting this version, you can load CT any time after
will import and merge into existing RT DB. If you haven't imported old CT DB and
already have a RT DB you want to keep, simply go set the VersionCopy flag to 0 in
the RT DB and the next time it sees CT RT will import.
2) merges orphaned CT RaidLog in RT DB (should fix things for a few not seeing old CT raids)
3) lots of fix-ups added and added import all the way back to probably the first version of CT
There should be a few misc. forks covered too
4) should be faster, i did a profiled performance pass. Also DBs from CT
should be about 10% smaller, and lots faster
5) rolled all the DB fix-ups into one internally and should be able to pass through
any CT db or RT db and merge and fix up DB at any revision for any fork even RT safely
6) Inst table in log was removed for using in-line fields

- Various fixes for instance and boss lookups
1) Oculus should work now
2) Pre-WotLK instances that were misspelled historically in CT are fixed
3) Supports full localization for all supported Blizz locales for functionality
esMX is missing some WotLK support, but the rest should track raids correctly

- small fix for attendee handling
- shows tag in instance names in UI for difficulty: Heroic, 10 man, 25 man.. etc
- more... :)

------------------------------------------------------------------------
r115 | celess | 2008-12-19 18:22:42 +0000 (Fri, 19 Dec 2008) | 27 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/Export.lua
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc
   M /trunk/RaidTracker.xml
   M /trunk/UI_Button.lua
   M /trunk/UI_Button.xml
   M /trunk/UI_Dialog.lua
   M /trunk/UI_ItemOptions.lua
   M /trunk/UI_ItemOptions.xml
   M /trunk/UI_Options.lua
   M /trunk/UI_Options.xml
   M /trunk/UI_Templates.xml
   M /trunk/locales/localization.lua

- met criteria for version 2.2
  which is working through rewrites of certain portions of the code not yet
  had a decent pass, WotLK data workable, stable features, and various
  enhancements too many to count along the way.
- tons of UI cleanup, fixes and polish mostly with the lower detail views and
  all of the lists
- worked through most of the list building, sorting and attendee gathering,
  should be much faster and more solid
- added player name to dialogs for cost and count
- added ability to set guildie rank thresh-hold for log guildies in options
  can choose off, all, or rank dynamically built when opening options,
  of the actual ranks in your guild. choosing a rank means will add players
  at that rank or higher but not below.
- cleaned up and enhanced item options UI
  now shows layers of items, defaults at the bottom, saved items in middle
  and new unsaved items at the top, layered alphabetically. a lot work went
  in as well to making much use-able.  you can also now get to the Item
  Option by left clicking on an icon in the lists.  This should make some
  peoples lives much easier doing excludes
- completed UI rework for item icons and lists
  links, special keys, pastes, dress up, loading non-cached, cursor icon,
  blending line highlights and pass through hits, etc.. all there now
  they are also the right size so not as distorted
- db update for cleaning DB for null joins and leaves.
- fixed bad void crystal ID for default item options
- fix for XML instance data
-- .. Ok I'm going to stop, lots more,  Enjoy :)
------------------------------------------------------------------------
r113 | celess | 2008-12-14 01:59:41 +0000 (Sun, 14 Dec 2008) | 9 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/Export.lua
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc
   M /trunk/RaidTracker.xml
   M /trunk/UI_Button.lua
   M /trunk/UI_Button.xml
   M /trunk/UI_Dialog.lua
   M /trunk/UI_Dialog.xml
   M /trunk/UI_ItemOptions.xml
   M /trunk/UI_Options.xml
   M /trunk/UI_Templates.xml

- lots of UI rework
- cleaning DBs in DB update for:
  nils in Leave Join from user player removes, cause was fixed as well
  session zone as empty string should have been nil, never empty string
  probably left over from CT imports, not accounted for. in this one no zone is no zone
- fixed export issue exporting new instance XML
- redid part of attendee lookups hops of fixing stat-up issue one person had
- fixed long time cosmetic UI issue where note icons were high stratus causing them to get drawn over other windows

------------------------------------------------------------------------
r111 | celess | 2008-12-12 23:44:57 +0000 (Fri, 12 Dec 2008) | 5 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc
   M /trunk/RaidTracker.xml
   M /trunk/UI_Dialog.lua
   M /trunk/UI_Options.lua
   M /trunk/UI_Options.xml

- added new log type - 3, for each group type
  configurable for each group type separately
  0 off, 1 log, 2 auto create, 3 auto instance
  raid is 3 by default
  this is the auto create session on change zone feature
------------------------------------------------------------------------
r109 | celess | 2008-12-12 21:59:04 +0000 (Fri, 12 Dec 2008) | 21 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/Export.lua
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc

- added new record for export XML for all formats
  added on both events and root of session
  it is assumed that this root one is true for all entries
  unless otherwise marked, although it is intended that
  each event be marked separately
  regardless of format, old conventions or otherwise, this tag
  primary driver was to allow dkp sites ability to distinguish
  10/25 man runs without having to contort things or lose automation
  guarantees:
   * all items are matched, they belong together
   * neutral enUS instance name
   * instance id is of the zone marked at same level if any

  <instance>
    <id>123456</id>
    <name>Molten Core</name>
    <reset>123456</reset>
    <difficulty>2/difficulty>
  </instance>

------------------------------------------------------------------------
r107 | celess | 2008-12-12 19:29:40 +0000 (Fri, 12 Dec 2008) | 6 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/Export.lua
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc
   M /trunk/UI_Button.lua
   M /trunk/UI_Dialog.lua

- fix minor xml issues
- rework attendees system
- fix issue not putting attendee names but the indexes when logging attendees
- clean bad attendees from db
- status text faster and more correct
- still need to fix logan issue but wanted to get this out
------------------------------------------------------------------------
r105 | celess | 2008-12-12 06:14:16 +0000 (Fri, 12 Dec 2008) | 5 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/Export.lua
   M /trunk/RaidTracker.toc

- fix minor export XML issues for EqDKP Plug-in - format 0
  version tag now shows
  time stamp for event was putting two, one in text and one seconds
  should have been just text

------------------------------------------------------------------------
r103 | celess | 2008-12-09 21:31:29 +0000 (Tue, 09 Dec 2008) | 2 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/RaidTracker.toc
   M /trunk/RaidTracker.xml

- fix db update issue, very sorry

------------------------------------------------------------------------
r101 | celess | 2008-12-09 17:39:02 +0000 (Tue, 09 Dec 2008) | 10 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/Export.lua
   M /trunk/RaidTracker.lua
   M /trunk/UI_Dialog.lua

- fix wrong DKP export version running, 1.5 was actually generating eq
- fix default setting for log guild to off
- fix issue re-version DB every load, causing 2 setting to be lost
- added remove icon feature
  use /rt hide   to how or hide mini-map icon or FuBar
- fixed event functional localization issues
- added realm to be stored in db per log, and generated on export
  realm is set when log starts
- much more...

------------------------------------------------------------------------
r100 | celess | 2008-12-09 00:14:02 +0000 (Tue, 09 Dec 2008) | 2 lines
Changed paths:
   M /trunk/RaidTracker.toc

- packager packaged 2.1.23,
 something is broken with packager, doing another version bump
------------------------------------------------------------------------
r98 | celess | 2008-12-08 23:58:36 +0000 (Mon, 08 Dec 2008) | 1 line
Changed paths:
   M /trunk/Data.lua
   M /trunk/RaidTracker.toc
   M /trunk/locales/localization.lua

- forgot to uncomment a line
------------------------------------------------------------------------
r96 | celess | 2008-12-08 23:24:54 +0000 (Mon, 08 Dec 2008) | 1 line
Changed paths:
   M /trunk/Export.lua
   M /trunk/RaidTracker.toc

- fixed export issue
------------------------------------------------------------------------
r94 | celess | 2008-12-08 23:20:05 +0000 (Mon, 08 Dec 2008) | 2 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/RaidTracker.toc

- fix attendees db issue
- DB version update roll-up into two sections
------------------------------------------------------------------------
r92 | celess | 2008-12-07 19:47:37 +0000 (Sun, 07 Dec 2008) | 81 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc
   M /trunk/UI_Button.lua
   M /trunk/locales/locale-enUS.lua
   M /trunk/locales/localization.lua

- fixed menu to go 4 levels for picking bosses, much nicer
- cleaned up drop-down menus
- added first pass bosses for WotLK
- added missing world bosses first pass
- cleaned up kill event code
- added original encounter exceptions back (RnJ, etc...)
- made fully functional test zone teldrassil if you want to see effect of options
  for some reason before going on a raid, teldrassil is the instance, and
  Nightsaber Stalkers are the bosses, why should i just get to play :)
- updated/fixed zone changes so that the display updates correctly if not in a
  raid log session, also should pick up subzones and other zone changes that have
  never ever worked before raid or no raid.
- fixed so that ANY boss that was in any list, includign the new ones in the drop
  downs, that wasnt already mapped to an event, get used as triggers.
- boss kills that are triggerable will also trigger a new log session
  if not already started and auto create for the group type is on, see bleow
  this puts a boss kill on parity with looting, otherwise you miss the event but
  get the boss loot record which was historicaly bad, and fun side affect is that
  if you down a classic world boss solo with autosolo on, you get to record it
  otherwise forget, mostly it makes this consistant.

- enhanced the autocreate for Raids, Parties, BGs, Arenas and Solo.
  rules are better, was never realy complete before looking at it.
  rules are (assumign you have it turned on for a particular type):
    raid,bg: if in a raid/bg and at least one player then create
    party,arena: in party/arena and at least 2 players create
    solo: not auto create based on group changes
    all: if no log is started and 1) loot drops or 2) a boss kill event then create,
      and loot must be above log threshhold
    this one enables autocreate for solo, it wil start on first loot
    this wil nto fire for /rt additem which depends on selected raid, if you were worried
- still to be worked through is how better Auto will affect raid log end
  this is a tricky one because differnt people want diff things, ill work something out.
- tooltips are purged if you have over 20 raid logs, see below
- user custom zones that match zones that exist in defaults were removed
  many zones have been added, this shoudl actually be nice for people that have had
  RT for very long tiem as well and feel stuck with them, the rules for it removing
  it you remove a zone from a raid manually were very cumbersome, remove one and you
  remove it form the list, this is no longer the case.

  
- Default for AutoParty is now 2 (AutoCreate), see above
  mostly this is because ther are a huge number of people wanting this to work
  for 5 mans since is now a feature, if was already set then it wont change it,
  only if its never been set.
- Default for AutoEvent is now 2 (On Kill), see below
- Default for TimeFormat is now 0 (12 hour time), see below, this wont affect DKP

- reset options for TimeSync, TimeFormat, TimeZone, LevelMax, SaveTooltips, DebugMode
  back to defaults, and AutoEvent if set to 1 (on mouse-over).
  in reading the below sections, its important to remember that some have had
  some form of RaidTracker for over 2 or 3 years. previous upgrades handled most
  of the transitions, but this give some a fresh start and fixes issues.

- TimeSync is gone, not needed anymore, all time is saved game time and
  the sync form local time to game time is automatic now, all db time values
  are inherently 24 hour saved as seconds since epoch, so DKP is fine.
  in a nutshell all db time is 24 hour sever time, display time will be 12 hour
  where appropriate. some users were getting robbed not getting to see 12 hour
  time when the reason they set ti was historically needed to save db values for
  DKP, users who had really old settings.
- TimeFormat: see above
- TimeZone still works but not needed for DB would only be for display, again
  this should be nice to remove this for almost everyone, the default is 0 hours.
  the original reason it was set was for DKP in the DB which see above no longer
  needed.
- LevelMax: this is a DKP export setting, this ensures every starts at 80 now
  just in case.  it was configured with a previous scheme update if it was 70,
  make it 80, but users who had it at 67 for some reason will fail DKP
- SaveToolTips: tooltips are purged if you have over 20 raid logs, these take a
  huge amount of space and are useful only for perusal in the DB file, they are
  not used by DKP or RaidTracker.  they are help for manual DKP fix-ups or just
  fun or curiosity. not functional part of RT.
- DebugMode: purged in case some don't understand enough to turn it off, but
  have been suffering the output, if it was set some long time
- Since the Event kill mechanism is working again after very long time, and
  the only way to queue next loot boss was mouse-over, this ensures that
  everyone will get a chance to get proper boss kill targets, the mouse over is
  a much more user aware option and not as solid as checking the same things
  on kill.  is special purpose usually.

------------------------------------------------------------------------
r90 | celess | 2008-12-07 07:30:14 +0000 (Sun, 07 Dec 2008) | 1 line
Changed paths:
   M /trunk/RaidTracker.toc

- version bump
------------------------------------------------------------------------
r89 | celess | 2008-12-07 07:29:38 +0000 (Sun, 07 Dec 2008) | 5 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/RaidTracker.lua
   M /trunk/locales/localization.lua

- fixed db update schema issue
- added wow 2.4 event processing for unit death
  events on boss kill should work again
- fixed issue with lookups not processing: player leaves, loot receives
- moved nax bosses to the new nax
------------------------------------------------------------------------
r87 | celess | 2008-12-06 22:42:08 +0000 (Sat, 06 Dec 2008) | 3 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc

- fix db update issue
- changed so ends raids when count hits 1 (you)

------------------------------------------------------------------------
r85 | celess | 2008-12-06 22:06:41 +0000 (Sat, 06 Dec 2008) | 1 line
Changed paths:
   M /trunk/RaidTracker.toc

version bump
------------------------------------------------------------------------
r84 | celess | 2008-12-06 22:05:01 +0000 (Sat, 06 Dec 2008) | 1 line
Changed paths:
   M /trunk/embed.xml

- missed part of name change
------------------------------------------------------------------------
r82 | celess | 2008-12-06 21:40:56 +0000 (Sat, 06 Dec 2008) | 1 line
Changed paths:
   M /trunk/embed.xml

-fixing revision issue
------------------------------------------------------------------------
r81 | celess | 2008-12-06 21:07:10 +0000 (Sat, 06 Dec 2008) | 1 line
Changed paths:
   M /trunk/.pkgmeta
   M /trunk/Data.lua
   D /trunk/Libs/Karma-1.0
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc
   M /trunk/UI_Button.lua
   M /trunk/UI_Dialog.lua
   M /trunk/embed.xml

-fixing revision issue
------------------------------------------------------------------------
r79 | celess | 2008-12-05 23:04:30 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/Data.lua
   M /trunk/RaidTracker.toc
   M /trunk/RaidTracker.xml

-test for db issue Players
------------------------------------------------------------------------
r78 | celess | 2008-12-05 21:09:26 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/Libs/Karma-1.0/KarmaAce-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaLocale-1.0.lua

-fixing revision issue
------------------------------------------------------------------------
r77 | celess | 2008-12-05 19:44:44 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/Libs/Karma-1.0/KarmaUtility-1.0.lua

-fixing revision issue
------------------------------------------------------------------------
r76 | celess | 2008-12-05 15:54:33 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/Libs/Karma-1.0/Karma-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaAce-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaLocale-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaUtility-1.0.lua

-fixing revision issue
------------------------------------------------------------------------
r75 | celess | 2008-12-05 15:45:09 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/locales/localization.lua

-fixing revision issue
------------------------------------------------------------------------
r74 | celess | 2008-12-05 15:42:33 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/Libs/Karma-1.0/Karma-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaAce-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaLocale-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaUtility-1.0.lua

-fixing revision issue
------------------------------------------------------------------------
r73 | celess | 2008-12-05 15:36:33 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/Libs/Karma-1.0/Karma-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaAce-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaLocale-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaUtility-1.0.lua

-fixing revision issue
------------------------------------------------------------------------
r72 | celess | 2008-12-05 09:35:13 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/Libs/Karma-1.0/Karma-1.0.lua

-fixing revision issue
------------------------------------------------------------------------
r71 | celess | 2008-12-05 09:25:01 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/Libs/Karma-1.0/Karma-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaAce-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaLocale-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaUtility-1.0.lua

-fixing revision issue
------------------------------------------------------------------------
r69 | celess | 2008-12-05 06:42:40 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc

-fix boss trigger issue
------------------------------------------------------------------------
r67 | celess | 2008-12-05 06:21:33 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/RaidTracker.lua

-fixing dates and highlighting
------------------------------------------------------------------------
r66 | celess | 2008-12-05 06:16:49 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/Export.lua

-stubbed xml for dkp for realm
------------------------------------------------------------------------
r65 | celess | 2008-12-05 06:02:32 +0000 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /trunk/Data.lua
   M /trunk/Libs/Karma-1.0/KarmaUtility-1.0.lua
   M /trunk/RaidTracker.toc

-added deathknight
------------------------------------------------------------------------
r63 | celess | 2008-12-05 05:12:06 +0000 (Fri, 05 Dec 2008) | 13 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/Export.lua
   M /trunk/Libs/Karma-1.0/Karma-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaAce-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaUtility-1.0.lua
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc
   M /trunk/RaidTracker.xml
   M /trunk/UI_Button.lua
   M /trunk/UI_Button.xml
   M /trunk/UI_Dialog.lua
   M /trunk/UI_ItemOptions.lua
   M /trunk/UI_ItemOptions.xml
   M /trunk/UI_Options.lua
   M /trunk/UI_Templates.lua
   M /trunk/UI_Templates.xml
   M /trunk/locales/locale-deDE.lua
   M /trunk/locales/locale-enUS.lua
   M /trunk/locales/locale-esES.lua
   M /trunk/locales/locale-esMX.lua
   M /trunk/locales/locale-frFR.lua
   M /trunk/locales/locale-ruRU.lua
   M /trunk/locales/localization.lua

-should now end a raid if group change event and just one (you)
  i will add an option to skip this for party and solo
  for those logging a days worth of leveling or whatever :)
-fixed a DB issue i hope fr soem that get Player error on start
-added nexus crystal to exclusion list
-added SWP bosses
-enhanced the boss choose menu which is sorted, and few more things in it
-fixed raid list highlight and cleaned it up
-fixed many many things from old CT
-... and more

------------------------------------------------------------------------
r61 | celess | 2008-12-03 05:09:42 +0000 (Wed, 03 Dec 2008) | 12 lines
Changed paths:
   M /trunk/Data.lua
   M /trunk/Export.lua
   M /trunk/Libs/Karma-1.0/KarmaAce-1.0.lua
   M /trunk/Libs/Karma-1.0/KarmaUtility-1.0.lua
   M /trunk/RaidTracker.lua
   M /trunk/RaidTracker.toc
   M /trunk/RaidTracker.xml
   M /trunk/UI_Button.lua
   M /trunk/UI_Button.xml
   M /trunk/UI_Dialog.lua
   M /trunk/UI_Dialog.xml
   M /trunk/UI_Templates.xml
   M /trunk/locales/localization.lua

-general bug fixes, lots
-fixed set cost issue, export issues
-rework menus again some and unify user changed value saves, more validation
-rework phase 1 of nextboss, boss, boss on hover, etc..
-reworked and made usable nextboss dialog
-reworked note, delete, etc... to be consistent
-lots of prep for boss kill and events working
-made events viewable again, made so back button work with events.
-and more...

------------------------------------------------------------------------