Minor changes after first iteration
Minor changes after first iteration