Fixed David's drag and drop simulation