Added more Thurston, refactoring