drag and drop fixed for theory