complete implementation of new PF cluster scheme