Reverting to the cloned version with additions...