Code done after merge