Tax Code Overhaul May Include Hybrid System