Updates by CPH

CPH