Yet more reimplementation