Hybrid and solo mode editing