Looks like we may have lost any mention of the 400 rule not sure. No time to review in depth right now. I depends on if this replaces 336 or amends 336 from the 2012 authorization bill.
The ATC part may cause this whole bill to be scraped and someone else may have a bill later that is not as nice for us.