Before final submit

General review pending