Get everything working again..