Mac Naughton returns to familiar territory