Bug Fix and merged accepted vars into tables.py