Dragging works yet slow

Change-Id: I37a02ce36d85adc36b74a3e60320aeb4fc817ff8