Integrate + old code deleted