Redoing all the changes from scratch again