new version still bug on login
updated login
version of main, need to add comment