Instance variable is now local variable
Flash notices for orders
Merges commits