Updated so setup actually works