Updated new codes