Review base (9/21)

Review base