Added a health check into the mix