4/30/26 - several substantial changes on all parts