Integrating chip's class
changes