Updated with auth in place