Merged the 2 changes together