Add feature borrowed from paleodd