updates to match regal modular branch