Incorporated final changes