Final Drop Code Changes