Changed to new join syntax.