Sheckler welcomes an old friend to the team