Drastically improve performances by simplifying the book-keeping