Changed to handle down and up, along with calling the refactored method
Changed to handle down and up, along with calling the refactored method

shiftkey/desktop,j-f1/forked-desktop,desktop/desktop,desktop/desktop,kactus-io/kactus,desktop/desktop,artivilla/desktop,say25/desktop,desktop/desktop,say25/desktop,shiftkey/desktop,artivilla/desktop,shiftkey/desktop,j-f1/forked-desktop,artivilla/desktop,say25/desktop,say25/desktop,kactus-io/kactus,j-f1/forked-desktop,kactus-io/kactus,j-f1/forked-desktop,shiftkey/desktop,kactus-io/kactus,artivilla/desktop