more input control
input table updated
merge gian