updating to use password
more changes