+magic values removed