I modified the PR a bit...please see now.