change of order + moved comments to metrics module