Minor changes on final version (v2)