Refined -p option

Now printing only on request