Reworked to deploy out-of-the-box