New functions /cc @darkf