Updated for shift-key