Added Ctrl-P Support