Merged master code