Fixed issues at 8.26
ALMOST Finish signin: revisit listing 8.33 & 8.34