Redoing, modifying this version itself.