Review base (10/21)

Review base