Added -P short option