Jdugan fluent

merge other changes.