Update 1.3 using flag vars