added changes from defense for ETD prep