Refactor Advance trail
Finish refactoring the Andvance trail