Updated for fcdpp