New version that's based on angular/ui-router