A lot of changes, mainly in formtable