refactored kit interface