Merged other developers code