refactor 0.1.3 Trail first part