Done some final modifications before sumitting iteration 2