minor changes to the merged code