Final version to be submitted; some final tests might still be done