Setup updates (3/20)

Setup updates