Fast rework for sake of have page ready for Brokerage event