Integrating the current code