Trying to make it compile
Merged