Updated for all-in-one setup