Additional pieces of the original implementation