changed due to multicomp implementation