new version without passwords and usernames