refactor 0.1.4 Trail completed