Main discussion and main file small changes