first try at making new password format work