Very important changes. Add chpu