1st push to loginFix branch
refactored code