Fixing Pickup stuff and staging instance