11/14/25 Massive revision