3.4: Added Legacy mode