Develop- merged stuff