moved nick back to correct names