Getting everything working again :D