integrate changes