Thanks for the PR! Why did you delete this big block though?