-Handler
  Corrected some issues with the ordering of adding elements.