minor changes
another try
still merging