Updated setup