merging and regenerating with PR #46