More work on linking.