Have a look at the changes in this PR and we can discuss