Updated to match the US demo setup