Changes for quote flow