Setup updates (5/20)

Setup updates