modified login model
merge code