Got rid of extra quak
Merge conflicts