Fixing demo env
Fixing drop