Additional tweaks.. preparing for new pull request