Add check for NEW/OLD