Added -p and -d