more changes to accomodate authentication