Updated to be compatible with Thesis 2.1