update to work with latest shard master