Began reimplementation.