trunk done with one entry incomplete to be fixed