More changes, added table