getting everything working again