- a few changes which might help overcome Jeroen's redeclartion problem
  (or might not)