@deeky666 I agree, can you draft a new PR?