Significant changes, integration, bug fix