little extension of the new implementation