Changed structure of the estimation