Fix dragging; Add more constant