Phase 2 without cure
Optimized imports
Fixed tube cursor