more changes to work out the contacts