Integrate CR suggtestions