revert to original Hybrid Base. Will use dev branch for my changes