Making sure everything still works
Merge