Made Ctrl-P better