I already have it in another PR, once I merge it, we can move these methods to that new script.