3rd part + fix to 2nd part