fixed same as last commit for dragndrop behavior + removed unnecessary variables