Added a duplicate of the old code before I destroy it