Re-work drop (client.py)