Updated new code