Adding @Atcold's utilities