code change to keep up with table changes