[PD] almost there...