Integration 12-01

Integration with added code.