Added shift key madness