fixing drag bug
rename refact