Added functionality from Palestrina.