Trac and Extend have been reviewed and b…

Trac and Extend have been reviewed and brought back into sync again.