Team review (8/12)

Team review