Support HB 516

Support HB 516