Improve old drop target method