modified login part