refactor
fixing auth conflict