Added more drag code