New version with IOC