further refactoring plus one analytics track