Merged all code