Review changes (4/28)

Review changes