Add drag and be careful about line 226 and 239