Drop System

Improved drop system