added better tooling & use Protracker instead