Setup updates (7/20)

Setup updates