Review changes (12/28)

Review changes