Update to Sing-in logic