New version with everything working.