responded to comments, minus get-password