FIX -  Auth ending