Clean and redlined of final version