comments + changes