Replace drop tracking system
Fix a syntax error
Merge from the branch 'develop-drops'