New, working version.