upated for dealing with secret passwords