Changed login and implemented