Make ctrl-p better