Make sample reflect new code changes