note that the new version will have some optimisation fixes