I think so, lets try that first. otherwise I think this PR is good.