final changes and tables