added custom auth need more edits