Changed redefinitions again^2