New version. Bug empty the add fields