Re-commit from Pi