First step towards integrating changes