Merged our code