repair the combined code problem and the new account function