reorganization of calculs for chom