Readded parametric for space