Added shift key awareness