Unmerged changes from addressing comments