changes to login, testing on server