rework
update
update
rename vars
fix table