Adding the new 2 changes