Completed till view part of auth