Removed temp_id