Rework for use specifically with ChiliProject.